Refresh patches from gbp pq

diff --git a/debian/patches/0001-test-with-current-interpreter.patch b/debian/patches/0001-test-with-current-interpreter.patch
new file mode 100644 (file)
index 0000000..3509bbd
--- /dev/null
+++ b/debian/patches/0001-test-with-current-interpreter.patch
@@ -0,0 +1,27 @@
+From: Dmitry Shachnev <mitya57@debian.org>
+Date: Sun, 14 Nov 2021 21:08:50 +0300
+Subject: Find the build directory matching the current interpreter
+
+This is needed to allow us to run tests with all supported Python versions.
+Without this patch, the latest build directory will be always picked, no
+matter what the current interpreter is.
+---
+ testing/buildlog.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/testing/buildlog.py b/testing/buildlog.py
+index f82191f..38538dd 100644
+--- a/testing/buildlog.py
++++ b/testing/buildlog.py
+@@ -62,6 +62,11 @@ class BuildLog(object):
+                     )
+                     sys.exit(1)
+ 
++                # We need to find the build directory for the current interpreter
++                py_version = "{}.{}".format(sys.version_info[0], sys.version_info[1])
++                if py_version not in build_classifiers:
++                    continue
++
+                 if not os.path.exists(build_dir):
+                     rel_dir, low_part = os.path.split(build_dir)
+                     rel_dir, two_part = os.path.split(rel_dir)

diff --git a/debian/patches/0002-disable-qtexampleicons.patch b/debian/patches/0002-disable-qtexampleicons.patch
new file mode 100644 (file)
index 0000000..17f3c1e
--- /dev/null
+++ b/debian/patches/0002-disable-qtexampleicons.patch
@@ -0,0 +1,18 @@
+From: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Date: Fri, 3 May 2024 16:47:57 +1000
+Subject: disable-qtexampleicons
+
+---
+ sources/pyside6/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sources/pyside6/CMakeLists.txt b/sources/pyside6/CMakeLists.txt
+index f45c071..fbb55a6 100644
+--- a/sources/pyside6/CMakeLists.txt
++++ b/sources/pyside6/CMakeLists.txt
+@@ -42,4 +42,4 @@ endif()
+ 
+ add_subdirectory(doc)
+ 
+-add_subdirectory(qtexampleicons)
++# add_subdirectory(qtexampleicons)

diff --git a/debian/patches/0003-Fix-missing-subparser-in-test-harness.patch b/debian/patches/0003-Fix-missing-subparser-in-test-harness.patch
new file mode 100644 (file)
index 0000000..02a6497
--- /dev/null
+++ b/debian/patches/0003-Fix-missing-subparser-in-test-harness.patch
@@ -0,0 +1,21 @@
+From: Stuart Prescott <stuart@debian.org>
+Date: Fri, 3 May 2024 16:48:49 +1000
+Subject: Fix missing subparser in test harness
+
+Not needed in the build but needed for debugging the test harness...
+---
+ testing/command.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/testing/command.py b/testing/command.py
+index 31a48f8..859ebf1 100644
+--- a/testing/command.py
++++ b/testing/command.py
+@@ -194,6 +194,7 @@ def main():
+         type=int,
+         help="use build number n (0-based), latest = -1 (default)",
+     )
++    parser_list = subparsers.add_parser("list")
+     args = parser.parse_args()
+ 
+     if hasattr(args, "buildno"):

diff --git a/debian/patches/0004-Add-failing-tests-to-blacklist.patch b/debian/patches/0004-Add-failing-tests-to-blacklist.patch
new file mode 100644 (file)
index 0000000..16d8c11
--- /dev/null
+++ b/debian/patches/0004-Add-failing-tests-to-blacklist.patch
@@ -0,0 +1,40 @@
+From: Stuart Prescott <stuart@debian.org>
+Date: Fri, 3 May 2024 16:50:13 +1000
+Subject: Add failing tests to blacklist
+
+Tests are still run but will fail. They are run multiple times to see if
+they still fail - it would be better to just skip them.
+
+It is not yet clear whether these failures are important.
+---
+ build_history/blacklist.txt | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+diff --git a/build_history/blacklist.txt b/build_history/blacklist.txt
+index 5f0183f..50531a3 100644
+--- a/build_history/blacklist.txt
++++ b/build_history/blacklist.txt
+@@ -91,3 +91,23 @@
+ [QtQml::qqmlincubator_incubateWhile]
+     pypy        # gives timeout on macOS if I run video converter while testing
+ # 2022-03-04 PyPy: Currently 28 of 657 tests fail
++
++# Debian packaging failing tests
++[sample::array_numpy]
++    py3
++[sample::nontypetemplate]
++    py3
++[pyside6-android-deploy::test_pyside6_android_deploy]
++    py3
++[QtCore::qinstallmsghandler_test]
++    py3
++[QtCore::loggingcategorymacros_test]
++    py3
++[QtGui::qpainter_test]
++    py3
++[QtQml::qqmlapplicationengine_test]
++    py3
++[QtCharts::qcharts_numpy_test]
++    py3
++[QtWebEngineCore::qwebenginecookiestore_test]
++    py3

diff --git a/debian/patches/disable-qtexampleicons.patch b/debian/patches/disable-qtexampleicons.patch
deleted file mode 100644 (file)
index 8a7b293..0000000
--- a/debian/patches/disable-qtexampleicons.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/sources/pyside6/CMakeLists.txt
-+++ b/sources/pyside6/CMakeLists.txt
-@@ -42,4 +42,4 @@
- 
- add_subdirectory(doc)
- 
--add_subdirectory(qtexampleicons)
-+# add_subdirectory(qtexampleicons)

diff --git a/debian/patches/series b/debian/patches/series
index edff00b205349ff5eb2c1e85465ad21b46b257ed..520f95842f38696ab14ade5cdb249de37ec6a559 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
-test-with-current-interpreter.patch
-disable-qtexampleicons.patch
+0001-test-with-current-interpreter.patch
+0002-disable-qtexampleicons.patch
+0003-Fix-missing-subparser-in-test-harness.patch
+0004-Add-failing-tests-to-blacklist.patch

diff --git a/debian/patches/test-with-current-interpreter.patch b/debian/patches/test-with-current-interpreter.patch
deleted file mode 100644 (file)
index a128cfb..0000000
--- a/debian/patches/test-with-current-interpreter.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Dmitry Shachnev <mitya57@debian.org>
-Date: Sun, 14 Nov 2021 21:08:50 +0300
-Subject: Find the build directory matching the current interpreter
-
-This is needed to allow us to run tests with all supported Python versions.
-Without this patch, the latest build directory will be always picked, no
-matter what the current interpreter is.
----
- testing/buildlog.py | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/testing/buildlog.py
-+++ b/testing/buildlog.py
-@@ -62,6 +62,11 @@
-                     )
-                     sys.exit(1)
- 
-+                # We need to find the build directory for the current interpreter
-+                py_version = "{}.{}".format(sys.version_info[0], sys.version_info[1])
-+                if py_version not in build_classifiers:
-+                    continue
-+
-                 if not os.path.exists(build_dir):
-                     rel_dir, low_part = os.path.split(build_dir)
-                     rel_dir, two_part = os.path.split(rel_dir)